Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

br: add GetTSWithRetry func #38663

Merged
merged 6 commits into from
Nov 3, 2022
Merged

br: add GetTSWithRetry func #38663

merged 6 commits into from
Nov 3, 2022

Conversation

MoCuishle28
Copy link
Contributor

@MoCuishle28 MoCuishle28 commented Oct 26, 2022 •
edited
Loading

What problem does this PR solve?

Issue Number: ref #36910

Problem Summary:
When the switch of the leader occurs in the PD, it affect the BR restore checksum process.

What is changed and how it works?

Add GetTSWithRetry func to replace GetTS in execChecksum func

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Manual Test

  • run restore with injected error
  • restore succeeded

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

Fix a bug that caused: When the switch of the leader occurs in the PD, it affect the BR restore checksum process.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Oct 26, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 3pointer
  • YuJuncen

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 26, 2022
@MoCuishle28
Copy link
Contributor Author

/component br

@ti-chi-bot ti-chi-bot added the component/br This issue is related to BR of TiDB. label Oct 26, 2022
@wuhuizuo
Copy link
Contributor

/run-all-tests

@MoCuishle28
Copy link
Contributor Author

/run-integration-br-test

1 similar comment
@MoCuishle28
Copy link
Contributor Author

/run-integration-br-test

@MoCuishle28
br: add GetTSWithRetry func
a7723c6 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@MoCuishle28
br: add GetTSWithRetry func
df06f50 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@MoCuishle28
Copy link
Contributor Author

/run-unit-test

YuJuncen
YuJuncen reviewed Oct 27, 2022
View reviewed changes
Copy link
Contributor

@YuJuncen YuJuncen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rest lgtm

br/pkg/restore/client.go Outdated Show resolved Hide resolved
br/pkg/restore/client_test.go Outdated Show resolved Hide resolved
br/pkg/restore/client_test.go Outdated Show resolved Hide resolved
3pointer
3pointer reviewed Oct 27, 2022
View reviewed changes
br/pkg/restore/client.go
@@ -1374,7 +1400,7 @@ func (rc *Client) execChecksum(
ctx = opentracing.ContextWithSpan(ctx, span1)
}

startTS, err := rc.GetTS(ctx)
startTS, err := rc.GetTSWithRetry(ctx)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we replace all rc.GetTS with rc.GetTSWithRetry?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe yes. But GetTS is widely used, so I think it needs careful evaluation and testing.

@MoCuishle28
add GetTSWithRetry func
b2bf784 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@MoCuishle28
br: add GetTSWithRetry func
5a4bdcc 
Signed-off-by: zhanggaoming <gaoming.zhang@pingcap.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 27, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 2, 2022
@ti-chi-bot
Copy link
Member

@MoCuishle28: /merge is only allowed for the committers, you can assign this pull request to the committer in list by filling /assign @committer in the comment to help merge this pull request.

In response to this:

/merge

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

@3pointer
Copy link
Contributor

3pointer commented Nov 3, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 5a4bdcc

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 3, 2022
@ti-chi-bot ti-chi-bot merged commit 7e5086c into pingcap:master Nov 3, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Nov 3, 2022

TiDB MergeCI notify

🔴 Bad News! New failing [2] after this pr merged.
These new failed integration tests seem to be caused by the current PR, please try to fix these new failed integration tests, thanks!

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/tics-test 🟥 failed 1, success 0, total 1 8 min 6 sec New failing
idc-jenkins-ci/integration-cdc-test 🟥 1 min 42 sec New failing
idc-jenkins-ci-tidb/integration-ddl-test ✅ all 6 tests passed 29 min Fixed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 12 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 10 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 6 min 42 sec Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 6 min 4 sec Existing passed
idc-jenkins-ci-tidb/mybatis-test 🟢 all 1 tests passed 3 min 4 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 2 min 51 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

@3pointer
Copy link
Contributor

/label needs-cherry-pick-release-6.1

@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. label Nov 22, 2022
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created: #39310.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Nov 22, 2022
@MoCuishle28 @ti-chi-bot
This is an automated cherry-pick of pingcap#38663
0ef3ae6 
Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 22, 2022
Open
12 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@YuJuncen YuJuncen YuJuncen approved these changes

@3pointer 3pointer 3pointer approved these changes

Assignees
No one assigned
Labels
component/br This issue is related to BR of TiDB. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@MoCuishle28 @ti-chi-bot @wuhuizuo @3pointer @sre-bot @YuJuncen